end any selection in progress, patch from db@zigo.dhs.org, #74620

2002-03-23  Havoc Pennington  <hp@pobox.com>

	* gtk/gtktextview.c (gtk_text_view_do_popup): end any selection in
	progress, patch from db@zigo.dhs.org, #74620

diff --git a/ChangeLog b/ChangeLog
index 520559e1c0d83e2fcb5b839525df22117045af75..9dfbeffa6fedecc2411ebeaa839d3c75bab072bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_do_popup): end any selection in
+       progress, patch from db@zigo.dhs.org, #74620
+
 2002-03-23  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): extend

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 520559e1c0d83e2fcb5b839525df22117045af75..9dfbeffa6fedecc2411ebeaa839d3c75bab072bf 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-03-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_do_popup): end any selection in
+       progress, patch from db@zigo.dhs.org, #74620
+
 2002-03-23  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): extend

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 520559e1c0d83e2fcb5b839525df22117045af75..9dfbeffa6fedecc2411ebeaa839d3c75bab072bf 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-03-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_do_popup): end any selection in
+       progress, patch from db@zigo.dhs.org, #74620
+
 2002-03-23  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): extend

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 520559e1c0d83e2fcb5b839525df22117045af75..9dfbeffa6fedecc2411ebeaa839d3c75bab072bf 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-03-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_do_popup): end any selection in
+       progress, patch from db@zigo.dhs.org, #74620
+
 2002-03-23  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): extend

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 520559e1c0d83e2fcb5b839525df22117045af75..9dfbeffa6fedecc2411ebeaa839d3c75bab072bf 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-03-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_do_popup): end any selection in
+       progress, patch from db@zigo.dhs.org, #74620
+
 2002-03-23  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): extend

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 520559e1c0d83e2fcb5b839525df22117045af75..9dfbeffa6fedecc2411ebeaa839d3c75bab072bf 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-03-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_do_popup): end any selection in
+       progress, patch from db@zigo.dhs.org, #74620
+
 2002-03-23  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): extend

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 0a26822cf242a0473bfc56ea9cb8bcb6f97834ce..676f732b35e15ef5f79252d1d542332bcb99b52f 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -6411,6 +6411,9 @@ gtk_text_view_do_popup (GtkTextView    *text_view,
 {
   PopupInfo *info = g_new (PopupInfo, 1);
 
+  /* should not need this, see http://bugzilla.gnome.org/show_bug.cgi?id=74620 */
+  gtk_text_view_end_selection_drag (text_view, event);
+  
   /* In order to know what entries we should make sensitive, we
    * ask for the current targets of the clipboard, and when
    * we get them, then we actually pop up the menu.